Report CPU type when we have it. (So I can figure out if we're wasting our

time with Universal binaries on Mac...)

diff --git a/config.h.in b/config.h.in
index acb907a92692c3bc8c47708b923fb443c885b502..393348a853dca9af8a4e817a699323d29150341b 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -30,6 +30,9 @@
 /* Define to 1 if you have the `sleep' function. */
 #undef HAVE_SLEEP
 
+/* Define to 1 if you have the `uname' function. */
+#undef HAVE_UNAME
+
 /* Define if we have va_copy */
 #undef HAVE_VA_COPY
 

diff --git a/configure b/configure
index be3745f4f7315cc30a7cce6662ac1c95598ba6c5..a8db5ea556c17062967bf421fb7371e54b24cc48 100755 (executable)
--- a/configure
+++ b/configure
@@ -4633,7 +4633,8 @@ fi
 # AC_CHECK_FUNCS([atexit floor localtime_r memmove memset pow select sqrt strchr strcspn strdup strerror strncasecmp strrchr strspn strstr strtol strtoul])
 
 
-for ac_func in nanosleep sleep
+
+for ac_func in nanosleep sleep uname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5

diff --git a/configure.in b/configure.in
index 714b5f66f17532ef4a42a99852cc7ac447975fce..dd1bd897c08988298bad591fb6c001e9deaa3c92 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -366,7 +366,7 @@ AC_SUBST(DOCDIR)
 # AC_FUNC_STRTOD
 # AC_FUNC_VPRINTF
 # AC_CHECK_FUNCS([atexit floor localtime_r memmove memset pow select sqrt strchr strcspn strdup strerror strncasecmp strrchr strspn strstr strtol strtoul])
-AC_CHECK_FUNCS([nanosleep sleep])
+AC_CHECK_FUNCS([nanosleep sleep uname])
 
 #
 # Checks for how the system handles va_list

diff --git a/gui/setup.iss b/gui/setup.iss
index 4b180af1c79a78c0f21c028be50a98bdf1f70672..9b805c171c09a6eaae33409e00bfd39539fc7898 100755 (executable)
--- a/gui/setup.iss
+++ b/gui/setup.iss
@@ -1,4 +1,4 @@
-; $Id: setup.iss,v 1.7 2009/09/08 16:06:32 robertl Exp $\r
+; $Id: setup.iss,v 1.8 2009/09/14 14:20:39 robertl Exp $\r
 ;\r
 ; NOTE: setup.iss is generated from setup.iss.in via autoconf.\r
 ; The generated setup.iss is checked in to help keep the version numbers\r

diff --git a/gui/upgrade.cpp b/gui/upgrade.cpp
index ea1d9cd4af1d843bfe2e0d8a964367c34bd81159..c366d3c7c00c6b2b74974d2d0e369ca958309666 100644 (file)
--- a/gui/upgrade.cpp
+++ b/gui/upgrade.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: upgrade.cpp,v 1.16 2009/09/07 00:55:07 robertl Exp $
+// $Id: upgrade.cpp,v 1.17 2009/09/14 14:20:39 robertl Exp $
 /*
     Copyright (C) 2009  Robert Lipe, robertlipe@gpsbabel.org
 
@@ -21,8 +21,13 @@
 
 
 #include "upgrade.h"
+#include "../config.h"
 #include "../gbversion.h"
 
+#if HAVE_UNAME
+#include <sys/utsname.h>
+#endif // HAVE_UNAME
+
 #include <QHttp>
 #include <QMessageBox>
 #include <QDesktopServices>
@@ -130,6 +135,12 @@ UpgradeCheck::updateStatus UpgradeCheck::checkForUpgrade(const QString &currentV
   args += "&current_gui_version=" VERSION;
   args += "&installation=" + installationUuid;
   args += "&os=" + getOsName();
+#if HAVE_UNAME
+  struct utsname utsname;
+  if (0 == uname(&utsname)) {
+    args += "&cpu=" + QString(utsname.machine);
+  }
+#endif
   args += "&os_ver=" + getOsVersion();
   args += "&beta_ok=1";   // Eventually to come from prefs.
   args += "&lang=" + QLocale::languageToString(locale.language());